Skip to content

feat(sagemaker): Merge SageMaker SSH Kiro integration#8589

Merged
laileni-aws merged 246 commits intoaws:masterfrom
ziwikiwi:feature/smus-m2-kiro
Feb 24, 2026
Merged

feat(sagemaker): Merge SageMaker SSH Kiro integration#8589
laileni-aws merged 246 commits intoaws:masterfrom
ziwikiwi:feature/smus-m2-kiro

Conversation

@ziwikiwi
Copy link
Contributor

@ziwikiwi ziwikiwi commented Feb 21, 2026

Problem

SageMaker Studio currently supports the ability for customers to connect their local VS Code IDE to SageMaker Spaces from the AWS Toolkit extension, but this is not supported for the Kiro IDE due to the Remote SSH extension for VS Code not being supported.

Solution

Merge staged feature enhancement which allows SageMaker Studio customers to connect to Spaces from the Kiro IDE. This includes the sagemaker-ssh-kiro sidecar extension as a scoped-down replacement for the Remote SSH for specifically SageMaker use cases, which will be installed on-demand with user consent when needed during the remote access ingress.

This PR includes a changelog entry.


  • Treat all work as PUBLIC. Private feature/x branches will not be squash-merged at release time.
  • Your code changes must meet the guidelines in CONTRIBUTING.md.
  • License: I confirm that my contribution is made under the terms of the Apache 2.0 license.

aws#2330)

Create ~/AGENTS.md with SageMaker Unified Studio context when the AWS
Toolkit activates on a remote SMUS Space. Uses HTML comment markers to
manage a section within the file, preserving any user content outside
the markers. Prompts the user before modifying an existing file that
doesn't have markers.

## Problem

When users connect to their space through their IDE, the code generated
through the IDE lacks context about the user's project. We are adding an
AGENTS.md and a context file that provides smus-specific context about
the user's space.

## Solution

When the AWS Toolkit activates on a remote SageMaker Unified Studio
Space (isSageMaker('SMUS-SPACE-REMOTE-ACCESS')), it runs
createAgentsFile() which creates AGENTS.md and links a separate
smus-context.md to it. The AI agent picks this up and gets SMUS-specific
context.

-> If AGENTS.md doesn't exist, we create smus-context.md and a new
AGENTS.md that just imports smus-context.md.
-> If AGENTS.md does exist and there is no import statement, we prompt
the user to modify their AGENTS.md with the import statement, and create
smus-context.md. We do not overwrite any of their changes.
-> If somehow smus-context.md exists but is not imported in AGENTS.md we
can still write to it, but we shouldn't touch the AGENTS.md. That would
mean a user doesn't want SMUS-context.md imported every time and we
should respect that.
->If AGENTS.md exists and has the import for smus-context.md, we just
write to SMUS-context.md without prompting the user.

---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.

Co-authored-by: Ziwei Ba <ziwikiwi@amazon.com>
## Problem
These merge artifacts were discovered when comparing the
feature/smus-m2-kiro branch to the staging branch.
- Entry for aws.smus.refresh command in toolkit/package.json
- Duplicate amazonq changelog entry

## Solution
Removed the changes.

---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.

Co-authored-by: Bhargav <bhargavavaradh@gmail.com>
Co-authored-by: Ziwei Ba <ziweichristina@gmail.com>
## Problem
- New feature requires change log

## Solution
- Added change log for new feature

---

- Treat all work as PUBLIC. Private `feature/x` branches will not be
squash-merged at release time.
- Your code changes must meet the guidelines in
[CONTRIBUTING.md](https://github.com/aws/aws-toolkit-vscode/blob/master/CONTRIBUTING.md#guidelines).
- License: I confirm that my contribution is made under the terms of the
Apache 2.0 license.

Co-authored-by: Bhargav <bhargavavaradh@gmail.com>
Co-authored-by: Ziwei Ba <ziweichristina@gmail.com>
@ziwikiwi ziwikiwi requested a review from a team as a code owner February 21, 2026 00:52
@amazon-inspector-ohio
Copy link

⏳ I'm reviewing this pull request for security vulnerabilities and code quality issues. I'll provide an update when I'm done

@amazon-inspector-ohio
Copy link

✅ I finished the code review, and didn't find any security or code quality issues.

@ziwikiwi ziwikiwi changed the title feat(smus): Enable connecting to SMUS spaces via Kiro feat(sagemaker): Merge SageMaker SSH Kiro integration Feb 21, 2026
gniumg-source added a commit to gniumg-source/aws-toolkit-vscode that referenced this pull request Feb 23, 2026
@gniumg-source gniumg-source mentioned this pull request Feb 23, 2026
gniumg-source added a commit to gniumg-source/aws-toolkit-vscode that referenced this pull request Feb 23, 2026
@ziwikiwi ziwikiwi force-pushed the feature/smus-m2-kiro branch from ef04fe6 to df23b88 Compare February 23, 2026 04:53
Comment on lines -75 to -82
// Check for any VS Code fork process
execFile('tasklist', [], (err, stdout) => {
if (err) {
resolve(false)
return
}
resolve(IDE_PROCESS_PATTERNS.windows.test(stdout))
})
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like this should already handle Kiro also, no?

Same across the other changes in this file..

@ashishrp-aws
Copy link
Contributor

/retryBuilds

@amazon-inspector-ohio
Copy link

⏳ I'm reviewing this pull request for security vulnerabilities and code quality issues. I'll provide an update when I'm done

@amazon-inspector-ohio
Copy link

✅ I finished the code review, and didn't find any security or code quality issues.

@laileni-aws laileni-aws merged commit 939bfb5 into aws:master Feb 24, 2026
38 of 53 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.